Removed size_request from GtkMenuBar

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 8dab56b972aab443d9533cf6dea846e39f65db7f..a28622a65f8cd24c7953d4c818db8e331c21ddb3 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -68,6 +68,12 @@ static void gtk_menu_bar_get_property      (GObject             *object,
                                            GParamSpec          *pspec);
 static void gtk_menu_bar_size_request      (GtkWidget       *widget,
                                            GtkRequisition  *requisition);
+static void gtk_menu_bar_get_preferred_width (GtkWidget     *widget,
+                                             gint          *minimum,
+                                             gint          *natural);
+static void gtk_menu_bar_get_preferred_height (GtkWidget    *widget,
+                                              gint         *minimum,
+                                              gint         *natural);
 static void gtk_menu_bar_size_allocate     (GtkWidget       *widget,
                                            GtkAllocation   *allocation);
 static gint gtk_menu_bar_draw              (GtkWidget       *widget,
@@ -98,7 +104,8 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
   gobject_class->get_property = gtk_menu_bar_get_property;
   gobject_class->set_property = gtk_menu_bar_set_property;
 
-  widget_class->size_request = gtk_menu_bar_size_request;
+  widget_class->get_preferred_width = gtk_menu_bar_get_preferred_width;
+  widget_class->get_preferred_height = gtk_menu_bar_get_preferred_height;
   widget_class->size_allocate = gtk_menu_bar_size_allocate;
   widget_class->draw = gtk_menu_bar_draw;
   widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed;
@@ -347,6 +354,30 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
     }
 }
 
+static void
+gtk_menu_bar_get_preferred_width (GtkWidget *widget,
+                                 gint      *minimum,
+                                 gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_menu_bar_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.width;
+}
+
+static void
+gtk_menu_bar_get_preferred_height (GtkWidget *widget,
+                                  gint      *minimum,
+                                  gint      *natural)
+{
+  GtkRequisition requisition;
+
+  gtk_menu_bar_size_request (widget, &requisition);
+
+  *minimum = *natural = requisition.height;
+}
+
 static void
 gtk_menu_bar_size_allocate (GtkWidget     *widget,
                            GtkAllocation *allocation)